Merge branch 'directfb-csw'
authorCody Russell <bratsche@gnome.org>
Fri, 10 Jul 2009 02:21:28 +0000 (03:21 +0100)
committerCody Russell <bratsche@gnome.org>
Fri, 10 Jul 2009 02:21:28 +0000 (03:21 +0100)

Trivial merge